Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Tue, 10 Dec 2013 17:56:03 +0000 (19:56 +0200)
committerEli Zaretskii <eliz@gnu.org>
Tue, 10 Dec 2013 17:56:03 +0000 (19:56 +0200)
commite1e93fd2be1cd687c5a140fe6b278971e9b8d499
tree479a3b51483f54da7fa1301ec2dd0b945e1d4d46
parent84e17402f02c6be9abd1b4db82532f00b9291110
parent7d7da2ed3b87aab2a0890501f313bd2470c1e140
Merge from trunk.